Merge pull request #2 from fogbow/master

general release fixes