Merge pull request #422 from nelenkov/dev

Preparing for 2.5 release
bug fixes