Merge

Merged bruno´s and diego´s stuff and touched some general settings