Use python2
Improve formatting
Merge remote-tracking branch 'bentglasstube/master'