sonofmun Merge pull request #1 from nathans/master