Changes as per pull request conversation

from #152