Merge pull request #77 from nsoranzo/misc_fixes

Misc fixes
PEP8 and other minor fixes