Refactoring for 0.8
Merge branch 'develop'