Fix for #201
Merge branch 'dev' into ms