moved control method to controller class
Merge branch 'master' into Bozis
added quary