Merge pull request #154 from StanleyDing/master

Improve code consistency.