Merge in changes per issue #34