added 1_48_0 support
1_38_0 work
version 2.0 work
Merge branch 'master' into 1.0