Fixed gview_cds bus error
Merge branch 'devel'