Merge pull request #18 from sebts/2.6/integration

v2.6.4