Kjq/addtokencheck #20

This addresses issue #20; @cheddar -- look OK to you?