Bug fixes + non-blocking file read added