added support for '-' and '.' but both not as the first as first character