fix #17
Preparing release 2.6
Back to development: 2.7