Fixing #39
Merge branch 'dev' into ms