Commit 75b7da22 authored by Thomas Dowrick's avatar Thomas Dowrick

Merge branch 'issue_94_95' into 'master'

Issue 94 95

Closes #95 and #94

See merge request !36
parents 7bc193a3 980b7c46
Pipeline #4290 passed with stages
in 11 minutes and 21 seconds