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