Merge pull request #1 from thesojourner/master

pull yukon
Merge pull request #8 from RCCAMER/master

Merge pull request #1 from thesojourner/master