changes made on Dec.2
Merge pull request #678 from lilyfan/Tarboz_w13

changes made on Dec.2