Making changes as suggested in #59.