GPS and Changed to modulelist
Merge branch 'master' of https://github.com/blaedj/mhcs