Prepare for release
Merge pull request #230 from trevorbernard/master

Prepare for release