LIB001-441: Trying to get changes in
Merge pull request #75 from ianthe/LIB001-441Fix

LIB001-441: Trying to get changes in