Merge pull request #1 from horx/dev

Dev
Merge branch 'dev'
deploy test
deploy test
deploy test