Merge pull request #1 from PerMalmberg/master

Update from original
Merge pull request #3 from Isaksson/master

Merge pull request #1 from PerMalmberg/master