Add vanish support, closes #1