fixed 'wait' bug; began parameter support
Merge branch 'custFileNames'