fix parse results
Merge branch 'andres' into develop