shawns changes
Merge pull request #3 from Lyonsclay/kleins

shawns changes