q7 queries + bugfixes
Merge branch 'master' of github.com:xicalango/fuzzy-robot