Merge branch 'develop'
Bump to version 0.31