More bugfixes (Figures 1 thru 16 should work now)
Merge branch 'master' of https://github.com/camo1018/GTMRS