Fix namespace conflict
Added a test case for merge request #9
Merge branch 'master' of https://github.com/sz91/slimcontroller into sz91
Merge branches 'sz91' and 'master'