Merge pull request #6 from niksu/master

generalised query evaluator
* Added more slightly complicated query - make_qyery function doesn't
seem to work
tuned;
fixed bug in query;