Merge pull request #1 from consolving/master

merges from master branch
fixes issue #16 - adding canceling button
Merge pull request #17 from phaus/master

fixes issue #16 and adds some more styling