add type casting
Merge origin/master