Merge pull request #92 from drobbs/master

Added Buttons