Changes made according to agrement with GP in meeting on 18th of April 2013

Signed-off-by: kcdc <kc@dafolo.dk>