Merge pull request #5 from lgulliver/dev

This resolves issue #4.
Merge pull request #6 from lgulliver/master

Merge pull request #5 from lgulliver/dev and closes #1