More sane default, simplified api.
Merge remote-tracking branch 'origin/master'