Merge pull request #1 from madskristensen/master

updated from original