Merge branch 'develop'
juise-0.6.0
Merge branch 'master' into develop