Merge "Added auto link support"