v 0.9.6
Merge branch 'devel'