Prepared code for release
Merge pull request #24 from andywillis/master

Prepared code for release