Merge pull request #7 from Mirantis/master

pull upstream changes
Merge pull request #8 from Mirantis/master

pull upstream changes
storage initialization at start was implemented
small fixes for query after functional testing
Merge pull request #53 from dukhlov/master

small fixes for query method after functional testing