Merge branch 'develop'
Fixed problem caused by wrong astype definition in result_data
Version 0.21
Merge branch 'hotfix-0.21' into develop