Merge pull request #1 from armmimic/submaster

Submaster
more cleaning