Updated bundle
Merge branch 'master' into pokedex