Added supporting od double dot and ,