Use reject on errors
Add dist files
Merge remote-tracking branch 'upstream/master'