updated classfinder dependency to 1.0 and some little code fixes
Merge remote-tracking branch 'origin/master'