Fix for #4 to enable loading from command line.