modification by sh 09302014
Merge pull request #3 from SenHuang19/master

modification by sh 09302014