Proper goal marking support
Merge branch 'master' of https://github.com/Sidetalker/TMRMaker