Issue #15
Merge pull request #16 from snaggled/master

Issue #15