Fix https://github.com/angelozerr/angularjs-eclipse/issues/42 + improve
https://github.com/angelozerr/angularjs-eclipse/issues/122