Cleaned up in Client module
Merge branch 'master' of https://github.com/golvmopp/sdmapeg