Merge new Resource and Browserify fix and example