Merge tag '0.2.3' into develop

0.2.3
Merge branch 'develop'