Clean up documentation
Improved documentation
Fixed namespace detection
Fixed namespace detection