some renaming
version removed
Merge remote-tracking branch 'origin/master' into master-c++11
nullptr used