Merge pull request #1 from serut/master

maj 14