Merge branch 'release/v1.1.2' into develop
Refactor entries so it can be re-used by relationship fields
Fix #33
bump version number to v1.1.3
Merge branch 'develop'