Add reference
Merge changes from Anders
Merge changes from Åsa