Added support for multiple files
Fixed layout warning in Grunt