Merge pull request #96 from Jan-E/master