Merge pull request #25 from billy1339/master

merg