Refactored again
Merge branch 'develop' of github.com:egisatoshi/leo_pod into develop