Fixed #180 - added max query result setting
Merge branch 'issue180-max-query-setting' into develop