Update based on github comments by @ghoneycutt