fix class load
Merge origin/master