fixes #72
Fixes issue #72
Resolves merge conflict and fixes #72