Fixed a bug
Merge branch 'devel'