DUDE CHANGE
Merge pull request #3 from BjarneFred/master

Merge pull request #1 from thisislorne/master
Merge pull request #2 from thisislorne/master

update from original 2