fix
Merge branch 'master' of github.com:TinyZ/tinyz.github.com