Cleanup, stability
Merge branch 'master' of github.com:dutt/oxidize