Merge branch 'develop'
Version 0.5.2
Version 0.5.3-SNAPSHOT