Merge branch 'release/0.2.3'
Merge branch 'develop'
Many improvement for 1.0.0 release
Refactored