a lot of changes, for the greater good :P
Merge remote-tracking branch 'origin/master'