Working Merge

Merged with caal and mathias