Fixed some stuff
Merge branch 'master' of github.com:firba1/dabopobo