Fix for #46
Merge branch 'dev' into ms