Removed contentjon from name spaces
Merge branch 'hotfix/0.1.1'