More changes to clean up.
Merge branch 'master' of https://github.com/mhassanpur/hamuju