Updated version
Merge branch 'devel'