Merge pull request #1 from Jeavon/master

Bundling enabled setting and create compiled files disable setting