meer meer meer fixes
Merge branch 'master' of https://github.com/MartijnVerkleij/rolit
Merge branch 'master' of https://github.com/MartijnVerkleij/rolit