prepare release
Merge pull request #26 from mikey179/master

prepare release