kinda almost done
Merge pull request #2 from DomiENG/master

kinda almost done