Clean up rename

master global class renamed to further avoid confusion in code.
Merge branch 'master' of https://github.com/indrora/Atomic