Merge pull request #2 from fogbow/master

general release fixes
Merge pull request #3 from fogbow/develop

Merge pull request #2 from fogbow/master