Added support for optional whitespace and browserify compilation stuff