integrated steve's code with jessica's code
Merge pull request #3 from jainapdx/Steve

integrated steve's code with jessica's code