prepare for namespaces
merge
merge
prepare for namespaces
fixes
fixes
Merge pull request #1166 from angel-kulikov/master

Готовимся к Namespaces