Update to v0.2.3
Merge branch 'dev'