Fix callback issue.
Merge branch 'hotfix/0.4.1'
Merge tag '0.4.1' into develop

0.4.1

Conflicts:
	bower.json
	package.json