Added regexp to parse sources properly