Updated SM
Merge pull request #7 from MASGAU/develop

Updated SM