Fixed bug
Merge branch 'task/pangool' into devel