Fix for #233
Merge branch 'dev' into ms