Merge pull request #17 from apenav/master

PEP8, lint and some random typos
Fix bugs in previous merge.