fixbug
Merge pull request #3 from keithorbit/master

fixbug