#29 Added explanation for generic exception catch
Merge remote branch 'fork/29'