Merge pull request #1 from peholmst/master

Sorry for this. :)