montagejs/popcorn — pull request #15 by mczepiel (2014-01-29 00:02:23+00:00)
Title: V2

Merged v2 from @francoisfrisch and resovled merge conflicts to make landing this easier