Support for all kind of files. Bug fixing.