Addressing #243
Make compranges more consistent
Merge branch 'dev' into ms