Merge pull request #85 from makinacorpus/master

master
first pass on pep8
first pass on pep8
first pass on pep8
Merge pull request #86 from makinacorpus/stable

Stable