Method still too complex
Merge branch 'integration' of https://github.com/fschram/cdtoolset.git into integration