Merge branch 'develop'
Version 0.2.4
Version 0.2.5-SNAPSHOT