Refactoring
Merge branch 'master' of github.com:tmc-eclipse/tmc-eclipse