Added in button for #24, closed #22.

See comments of #22 for more info.