Merge pull request #1 from thesojourner/master

pull yukon