stuff
Merge pull request #44 from Gegga87/master

stuff