Readd bundler.py with some corrections