fixed extensions < 3 chars and filenames < 6 chars. Merging into master