Bugfix
Merge branch 'dev' of github.com:MicroMagnum/MicroMagnum into dev
small fix