burgfix
Merge branch 'develop' of https://github.com/guntiso/querease into develop