Refactoring and changed format of sent messages
Merge branch 'master' of https://github.com/magnushg/SuperGuide