Merge pull request #1 from KarimGeiger/master

merge
added C++
Merge pull request #3 from nilsding/master

added C++