Merge pull request #2 from philsmd/master