Merge branch 'master' of github.com:jsuper/jsuper.github.com