Merge branch 'hotfix/33'

Close #33
Fixes #32
[#39] Use `getIdentifier()` to get ID

- within `options()`, instead of old mechanism.
Merge branch 'hotfix/39' into develop

Forward port #39