added smeagol file fetcher
resolved merge problems manually