fixes
Merge branch 'master' of github.com:jackdreilly/Yokel