Bug 1903

Gist with pyLint and nosetests results: https://gist.github.com/rszalski/486d0a7d7478fd8baa6a