Merge pull request #97 from orbea/error