Code cleanup
Update version
Merge branch 'release/0.2.3'