Merge branch 'feature/pytest' (closes #163)