Fixed checking for decimal points
Merge origin/clone into clone
Fixed checking for decimal points
Fixed checking for decimal points