Merge pull request #222 from trevorbernard/master

Fix issue #200