Merge pull request #2 from zongordon/master

v2.10.1
Merge stable