Added Vikman back
Added Trolltoft
Merged in Vikman