Revamp of the range regex (with real bits of Ninja inside)