Added @ross for work on #1187. Thanks!