Added popup
Merge branch 'master' of github.com:dalgong/dotemacs