Added button for killing whole application
Merge branch 'master' into gh-pages