Added more flexibility in *.kv filenames
Merge pull request #1553 from mid-kid/master

Added more flexibility in *.kv filenames