Merge pull request #25 from htakahashi/josh

Josh
new button
Merge branch 'refs/heads/master' into josh