Merge pull request #6 from brentthorne/dev

Issue #5 possible fix