More changes
Merge Resolution
Merge branch 'master' of github.com:blaedj/mhcs
monolithic commit