Merge pull request #99 from orbea/revert-97-error