Bugfixes
Merge remote-tracking branch 'upstream/master'
Merge from upstream/master, pymode warnings cleanup
Merge pull request #26 from pavelki/master

Bugfixes