Fix namespace
Problem #4