Merge pull request #4 from Jensyn/master

Merge pull request #2 from Jensyn/master