Revert "some fixes"
Merge pull request #147 from E2OpenPlugins/revert-146-master

Revert "some fixes"