Merge branch 'new'
Merge branch 'master' of https://github.com/joaovitoras/kiira-onew