Merge pull request #3 from allenh1/master

I modified erything
Merge pull request #4 from allenh1/upstream

Merge pull request #3 from allenh1/master