Merge pull request #1 from skyebear/master

add sisis
hehhe
Merge pull request #2 from bjornxiong/master

Hi