* support both versions of model notes file name. Fix for #641 * Adding support for names with spaces * Fix compilation