Merge into amcat

Creating the pull request so we can add comments