Updating to include pull request #240