Merge #22 into tmp

Approved-by: alexcrichton