Fix for thousands seps [#140][#161]