[SD] Merge code.
Merge branch 'master' of github.com:bcc0421/SmartData