Merge branch 'dev'
Release 0.2.3
Bump to 0.2.4-SNAPSHOT