add ga support
Merge branch 'develop'
add ga suport