fixed issue mentioned in #40, removed unnecessary namespaces