Change to how filenames are parsed into names
Merge pull request #101 from kaysoky/filenameGuessing

Name guessing