Changes from agersho branch

New file