Testing #87

Closed
hughrun wants to merge 4 commits from testing into master

4 commits