Added s2d() and d2s()