Merge tag '0.8.3' into development

0.8.3
fix bug
Merge branch 'release/0.8.4'