Merge pull request #7 from philsmd/master