Added support for key-prefix option
Merge branch 'feature-keyprefixes'