Season to taste.
Merge branches 'kgaughan-pep8' and 'master'