updated code to include if(hasArg(filename)) or if(hasArg(file)) instead of filename="", etc.
Merge branch 'fix-filenameArg' into develop