Addressing #223
Merge branch 'dev' into ms