Make changes asked by breunigs
Add Merovius to contributors