Did some stuff and yeah
Merge branch 'master' of github.com:mgaut72/phiMessage