Addressed github #18
Merge branch 'dev' into ms