Fix #95
Working on ms
Merge branch 'dev' into ms