Fix warnings and bugs
Merge branch 'master' of github.com:blaedj/mhcs