273 fixing merge conflicts

This closes #273 (closed)

This merge request was necessary due to merge conflict mishandling by me. This resolves all issues of merge request 256