Merge pull request #6 from YfLn/Tyler

Tyler
space is sin
Merge remote-tracking branch 'origin' into yufan