Some fixes
Merge branch 'master' of https://github.com/dorilla/xyz.git
Merge branch 'master' of https://github.com/dorilla/xyz.git