Fixes Issue #84.
Merge branch 'master' of https://github.com/popcorn-time/popcorn-app