Merge pull request #12 from FrankPrince/master

New
Merge pull request #13 from FrankPrince/master

20140506
version6 7Jun

version6 7Jun
version6
Merge pull request #6 from Aaron-zheng/master

version6 7Jun