final version
Merge pull request #85 from lkania/errors-l

final version