C++ Nokia tested and works!

also pulled upstream nokia C changes