david415 Merge pull request #1 from katzenpost/update_from_master