Subject: fixed namespaces and 80 column limit.
Merge pull request #2 from psachin/namespaces

Subject: fixed namespaces and 80 column limit.