Merge pull request #7 from mammothbane/nathan

merge testing