update in second branch

update in second branch
fix #3
Merge pull request #4 from stanleyw2014/second

Second