still has some bugs in the control after loading the bundle, but bundle is working now
Merge remote-tracking branch 'origin/master'