Fix a bug!

Fug a bix!
Merge pull request #1 from potasmic/gh-pages

pull
Merge pull request #2 from potasmic/master

Pull js