Merge branch 'issue444' into develop

Resolves issue #444.