Merge branch 'release/0.1.6' into develop
Fixed bug requiring primary key
Merge branch 'release/0.1.7'