Merge pull request #1 from jonasoreland/master

Update from original