fix underscore
Merge branch 'wide-system' into hotfix-problem-h
hotfix  into testing.h
Merge pull request #5 from cmc-freedom/hotfix-testing-and-wide-system

Hotfix testing and wide system
Merge branch 'master' into compilation
some changes in compilation.h