Fixed buggy
Merge branch 'devel'