Merge pull request #2 from Jan-E/master