Merge branch 'master' into develop
rename item field
Merge branch 'issue-13' into develop
update version
Merge branch 'release_0.1.7'