Various changes and fixes
Merge branch 'feature/conversion' of github.com:egloo/eglooframework into feature/conversion
dumb