Update samples
Merge pull request #1593 from pandamicro/develop-3.0

Update samples