Merge pull request #3 from HasseHauch/master