Adding a wrapping namespace if needed. Closes #7