Merge branch 'martinal/fix-issue-78'
Fix Issue #300
Merge branch 'garth/fix-issue-300' into next