An Improved Method of Preparing Testosterone, Dihydrotestosterone and Some of their Esters