Brian-Jiang Merge pull request #4 from Brian-Jiang/v0.9