Fixes from debug session
Merge branch 'master' of github.com:ppannuto/M-ulator