Merge pull request #15 from frankmu/master

ddd
Merge pull request #16 from frankmu/master

f
Merge pull request #17 from frankmu/master

ds
fix popup