Better detection of the crate file in the arguments. Closes #1