* use annotations with dependency injection in order to avoid errors when minifying
Merge branch 'hotfix/0.0.6'