Merge pull request #2 from momentum/0.3/cleanup

salvation