Merge pull request #11 from mikey179/master

integrate latest changes
Merge pull request #12 from mikey179/master

updates
prepare release