Added Linked IN stuff
Fixed conflicts
Merge pull request #21 from g3-ks/Keval

Keval
Pulled from updated origin master and merged with madhatter-
Merged with Keval's code