Merge pull request #19 from tvkwoodlands/master

weird stuff
Merge pull request #7 from kaitlin-farr/master

update