7:45 added error changes
Bacon
Merge remote-tracking branch 'origin/master'