Support both AE rv1 and rv2

Fixes #20