Fix for #259 (from JW)
Merge branch 'dev' into ms