fixed a mistyped comment
.
remove tr1 namespace
ifdef support for C++11 vs. using tr1
fix namespaces