Merge pull request #52 from am11/master

Nightly: Version 2.2.6
Merge pull request #53 from am11/master

Nightly: Version 2.2.6.1
Nightly v2.2.7