Addressing parts of #25
Merge branch 'dev' into ms