Addressing #199
Merge branch 'dev' into ms