final before small touches
Merge branch 'master' of https://github.com/jak1192/MySPIM