Change namespace. Closed issue #6