Update
Merge pull request #1 from leach/master

Updates from leach