Merge pull request #229 from trevorbernard/master

Fix issue #228
Merge pull request #230 from trevorbernard/master

Prepare for release