Partial check-in.
Merge branch 'master' of https://github.com/mhassanpur/hamuju