Auto-discovery mode is added
Merge branch 'Final' of https://github.com/karthikp-ubc/LLFI-SFIT into Final