Fixed expression parsing.
Updated headers.
Added solution dotSettings.