Merge pull request #42 from Magenic/master

Merging into my local fork.
Fixing issue #163
Merge pull request #164 from jwendl/master

Fixing issue with close button missing.