Ok, fixed a Niaderp and manually added the changes of #3 :3. Sorry @penne12!