Improving error messages
Merge pull request #5 from jonasmonnier/feature-improve-error-messages

Improving error messages