Merge pull request #23 from yushan87/v2_play2.1

V2 play2.1