Merge pull request #1 from thisislorne/master

update from original
Merge pull request #3 from BjarneFred/master

Merge pull request #1 from thisislorne/master