Cont'd sp2 dev
Merge branch 'master' of github.com:MicroMagnum/MicroMagnum