Toolchain refactoring
Merge branch 'master' of github.com:lanoxx/fuml-refactoring