Closes #10
Merge branch 'enhancement-#w10' into develop
Closes #18
Merge branch 'enhancement-#w18' into develop
Closes #19
Merge branch 'enhancement-#w19' into develop
First part of the ResultQuerySpec.
See #15