Minor 'bug' fixes! Fixes an issue that can occasionally prevent a result being returned.

Even greater improved accuracy of results.