Merge pull request #4 from andrewmichaud/master

Merge
Merge pull request #5 from andrewmichaud/develop

Merge pull request #4 from andrewmichaud/master