add some demo and fixed bugs
Merge branch 'dev'