kris 1
Merge pull request #2 from ameron32/master

kris 1
Merge pull request #3 from micahcomer/kristest

Kristest