hotfix
Merge branch 'devel' into master
bump version 1.0.2.1