Muploaded stuff from Chalmers
Added Martin