Added thumbnail support;
Minor changes;