Merge pull request #51 from am11/master

Nightly: Version 2.2.5