API extended to support onelevel keys(without hashes).
Merge remote-tracking branch 'origin/master'