forgot a few things
Merge branch 'feature/conversion' of https://github.com/egloo/eglooframework into feature/conversion