Fix for #101
Merge branch 'dev' into ms