Fix for issue #38 and ssn format fix