add an extra to errors
Merge branch 'dcharbonnier-master'
release 0.6.0