Fixed some ugly coding
Merge branch 'master' of https://github.com/hampusadamsson/multicore
Merge branch 'master' of https://github.com/hampusadamsson/multicore