Merge pull request #1 from PerMalmberg/master

Update from original