Addresses further issues in #2
Merge pull request #3 from vaxinate/master

Addresses further issues detailed in #2