Merge pull request #31 from KirinDave/master

2.5.1 update
Cutting v2.5.2-RR