Submit changes of 0.5.1 (use of vendor folder)