Merge pull request #134 from Alexpux/develop

Correct targets for GCC
Merge pull request #135 from Alexpux/develop

Revert "Correct targets for GCC"