Merge pull request #97 from SpyrosRoum/Improve-FinalError