Move listeners out of the init method.
Merge branch 'hotfix/0.1.5'