Translated comments, removed obsolete stuff
Merge branch 'master' of https://github.com/fraben/mockey