Merge pull request #268 from rcchan/master

pep8 1.4.6 indentation fixes