Update from OldCoder Oberyn

Revision更新到Beta4