Clean up, clean up...everybody everywhere...
Merge branch 'master' of https://github.com/infolock/ESTCompanion