Merge pull request #50 from ercchy/master

Fixing js bug
adding missing button