Make changes requested in #150.