Merge branch 'feature/issue-60-fix-failing-tests' into develop
Merge branch 'develop' into feature/issue-51-summarizers-should-accept-a-time-alignment-function