Release-fixes
Merge pull request #4 from iceglow/cleanup

Release-fixes