Merge branch 'hotfix-1.0.1'
fix list key
Bumped version to 1.0.2
Merge branch 'hotfix-1.0.2' into develop