Updated code
Merge pull request #9 from jefarrell/master

Updated code