Simply modified version and updated popcorn files to 1.3.0