almost done
Merge pull request #9 from DomiENG/master

almost done