Merge pull request #5 from mammothbane/nathan

merge into master