Fix compil errors
Merge branch 'master' of github.com:hansfilipelo/MapMaster2001