Addressing issue #148
Merge branch 'dev' into ms