Made changes suggested in pull request 103. Pull request 103 is the fix for issue 102