fix public fields
fix Curl
Merge branch 'develop'