Bugs fix and optimization.
Change the version number.
Fix a regression.
Merge branch 'develop'