Add support for variant/result sets

Signed-off-by: Don Naegely <naegelyd@email.chop.edu>
Merge branch 'master' into issue-2