change popup showing conditions, fixes #13
Merge pull request #14 from virtkick/newsletter-conv

Merging newsletter-conv into master.