Merge pull request #4 from Aaron-zheng/master

20140526version
20140529

20140529
Merge pull request #10 from FrankPrince/master

20140529