update
update readme
Merge branch 'master' of https://github.com/StuPig/popup

* 'master' of https://github.com/StuPig/popup: