refactoring
Merge branch 'master' of https://github.com/JulianKelly/RMI.git