started working
Merge remote-tracking branch 'origin/master' into pimpl
Pimpl, remove template for RBTree