scott 6 - updated
Merge pull request #5 from djragsdale/Scott

scott 6 - updated