Merge pull request #1 from Yonsm/master

Merge pull request #6 from sinri/master
Merge pull request #2 from Yonsm/master

07071116 Merge To Sinri's
140707 Asa

140707 Asa
Merge pull request #7 from sinri/master

07071141 to Yonsm's