modified code
Merge pull request #3 from johnchase/master

modified code