Merge branch 'develop'
Release version 0.1.3