Update readme file and fixed small bugs on custom errors.
Merge branch 'diego'