avoind exception when in runtime not find class
Merge branch 'v1.1.1'