dariasor

Hi Yin, I figured out how to do a proper pull request - here it is. I've added a few more modifications and it is safe to merge my changes...