Testing issue #23, seems to work fine for me, poke @ejjpi