Merge pull request #2 from Kanyanat/master

first
again
again
CodeChanged
Merge pull request #4 from spiderokingo/master

newCodeChanged