Finished

its finished
Merge pull request #1 from dewindem/master

Finished