Fixed some bugs...
Merge branch 'master' of server:SMS