Flexible key val

Fixes #93