This pull request fixes pull #42