Failing test
Making the test pass
Merge branch 'Issue307' into develop

Closes #307