Fixes #7
Merge pull request #9 from jkenneydaniel/dev

Fixes #7