Fix for #42
Merge branch 'dev' into ms