Changes based on pull request #6 feedback again (fixes #4)