Updated version of karinbergman-se-2.0