Fixed bugs
Merge branch 'master' of https://github.com/tjokimie/dodo