Merge pull request #18 from trevorbernard/master

Fix issue #17