Fang, why are you so lazy? Merged changes from the repo I made.