Add more diagnostic on error
0.3.8
Merge branch 'master' into macosx