Merge pull request #50 from Run/v2.0

refine the code to follow the rules in CodingStyle file.