Ups, some files didn't get added, silly pycharm =P
Merge remote-tracking branch 'origin/master'