Fixing LF issue and fix for #398.