Resolves #1
Merge pull request #2 from mitchellbusby/master

Resolves #1