added namespaces
new config param
Merge branch 'dev' into namespaces
namespaces
added own exceptions