added namespace, improved documentation