Fixed issue #117
Merge branch 'dev' into ms