Commit 457b2746f0606cc4ebc0da7f621388f37cc6c427

Xiangfu 2014-05-09T11:30:28

Minor changes