Merge v4-dev into master

Closes #159 

Have already tagged this as `v4`