merge with internal bugfix
Merge pull request #86 from chen3feng/develop

merge with internal bugfix