Merge pull request #550 from MarioLiebisch/mobile

Fixed several issues