namespaces fix
Merge pull request #5 from hemze/master

markup upd + crn chngs
Merge pull request #5 from rigidus/master

upd