Grammar changes suggested by @nikwen merged in master