almost almost done
Merge pull request #10 from DomiENG/master

almost almost done