Resolves both issues in #17 (c.f.  https://wiki.duraspace.org/display/DSPINT/Release+3.2.0+Tasks)