TODO
Comments
More comments
Removed unneeded code and added more translation
Merge pull request #1 from Badspeed/testing

Merged