New version

Hi Johan,

I made some changes to generate a smoother geometry. 

Best,
Yi