code changes as suggested in #40