25042014 commit

sms ok but not tested fully