Don't ss int or float
Merge branch 'develop'