basically done
Merge pull request #12 from DomiENG/master

basically done