Closes #259
Merge branch 'dev-0.3' of github.com:popcorn-official/popcorn-app into dev-0.3