still testing stuff for figuring this out
still testing things
Merge pull request #3 from bartholdja/master

still testing things