Merge pull request #7 from aktse/master

resolved merge conflicts
finished search by key/value
Merge branch 'master' of https://github.com/C291F14/C291A2