Merge branch 'p3'

Closes #60
Fixes #59