2.5.24
Merge pull request #4 from malles/master

2.5.24