stuff changes
Merge pull request #1 from dmccraw/dustin

stuff changes