Fix nosetests.
Bump the version
Merge branch 'release/1.0.10' into develop
Fix pep8 and none type issues.
Bump version.
Merge branch 'release/1.0.11' into develop
Fixed Merge issues