Remove redundant +
Add WARC support and samples