updated version of errorgrab
Merge branch 'develop'