Merge change I8018f091 into eclair

* changes:
  Add very simple input path. Fix end-of-line issues.