Merge pull request #6 from bjz/dev-bjz

Value variant twiddling