Fixes #15
Fix pylint error so travis can pass.
Merge branch 'no_namespace' into fix_patch
Merge branch 'fix_patch' into no_namespace