Updated as per comments on #195