Removed trailing space
Fixed error_reporting issues
Merge pull request #209 from rozwell/error_reporting

Fixed error_reporting issues
Merge remote-tracking branch 'upstream/master'