Added @etos.

For fixes in #1029, #1030 - Thanks!