Merge pull request #16 from Gegga87/master

trolol
Changed something.
starting with messaging