Some fixes :D
Merge remote-tracking branch 'upstream/master'