Fixed subsetting issue.  Closes #51
Merge branch 'issue51' into devel