Incorporated some changes suggested by Travis.