Fixes for pull request #101