This resolves the merge conflicts that are present in pull request #300