solve the first problem
Merge pull request #2 from smno1/master

solve the first problem