Fix issue #7 which should help fix issue 6 as well. Replaced all the basename(__CLASS__) with basename(str_replace('\\', '/', __CLASS__)).
Merge remote-tracking branch 'origin/1.1.x' into 1.1.x