some stuff
Merge pull request #18 from Gegga87/master

some stuff