Merge branch 'master' into error_reporting
Merge pull request #357 from zkessin/error_reporting

Error reporting