more stuff
Merge pull request #7 from DomiENG/master

more stuff