Merge branch 'CleanUp' of https://github.com/timidger/Mao into CleanUp
Merge branch 'CleanUp' of https://github.com/timidger/Mao into CleanUp