Updated the maintainer's list
Added catch() clause handling into class detection
Merge branch 'master' into my-develop