added func goli
Merge branch 'devel'