fix all
Merge branch 'master' of github.com:guileen/guileen.github.com