Merge pull request #220 from KurtStam/master

updating to the official S-RAMP namespace