Added funcs for detecting and handling includes
Added tilda