shiny refactoring
Merge branch 'develop' into pre-release-0.2