move #endif to guard namespace closing braces
#466
Merged
#endif to guard namespace closing braces
#466