Changed some trace prints and updated plotting
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2001