Made changes suggested in issue #273