Master

Merging ged-lab/master into RamRS/master