Merge pull request #1 from krasimir/master

0.3.25