Merge pull request #4 from andrewmichaud/master

Merge