Merge pull request #22 from Jan-E/v2.5.x