fixed typo
changed namespace
adjusted config file
Merge branch 'hotfix-2.0.1' into master