Merge pull request #39 from dkorolev/master

Removed key components delimiter.
Merge branch 'master', remote-tracking branch 'upstream/master'