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

Prepare for release