More hack ideas
Merge remote-tracking branch 'origin/master'