Made changes supporting pull request for issue #60