Adding msid support
Fixing tests
Merge pull request #100 from martinthomson/sdparta_msid

Adding msid support