refactoring and bugfixes
Merge branch 'master' of github.com:EveryBit-com/everybit.js
bugfixes and refactoring