Resolves issue #16 in https://wiki.duraspace.org/display/DSPINT/Release+3.2.0+Tasks