FIxed update and rework some code.
Revert "FIxed update and rework some code."

This reverts commit 538738d962eba8eedb05bb5780eaee7167ed8e69.
Merge branch 'master' of https://github.com/Openovate/evejs