cleaned up code
Merge branch 'dev' of https://github.com/fisterryan/Popcorn into dev