Bringing pull request #95 up to the master branch