Merge pull request #1 from sooop/dev

Dev
Merge branch 'master' of https://github.com/sooop/w
Merge branch 'master' of https://github.com/sooop/w
Merge branch 'dev'
Merge branch 'dev'