Merge pull request #21 from Jan-E/master