Add C99/C++11
Merge pull request #2340 from noct/cpp11_c99

Add C99/C++11