Merge pull request #3 from allenh1/master

I modified erything