Added line_in support, completed a few functions
Merge remote-tracking branch 'origin/master'