Typo and wrong return value

Minor things, type and wrong return value
Merge branch 'feature/60'

Close #60
Merge pull request #61 from Wilt/patch-1

Typo and wrong return value
[#61] Revert change to setEventManager return annotation

- `self` is correct.
Merge branch 'hotfix/61' into develop

Forward port #61