Update to 2.6.1
Merge pull request #1 from guersam/patch-1

Update to 2.6.1