Accept raw elements as well as $

Affects #16