Merge branch 'hotfix/fix.data'
fix #13
Merge branch 'hotfix/fix.13' into develop