Totally changed everything!
Merge pull request #11 from kshaffer/master

pulling changes