bugfix
Merge branch 'develop' of github.com:mrumkovskis/Query into develop