Addressing #269
Merge branch 'dev' into ms