Added some namechanges
Removed some comments
Merge branch 'master' of https://github.com/madken/wordpress-plugin