Fixed namespaces. Syntax improvements.
Readme update.