Updated for 2013

Popcorn 1.3, new stuff