Small improvements
Merge branch 'release/0.2.3'