Merging in changes to help with issue #120