Take care of some formatting issues.
Merge pull request #43 from garena/master

Take care of some formatting issues.