Updated to pylint conventions.
Merge branch 'working'