Got 2.3 to work
Merge branch 'master' of https://github.com/accidentalManual/1653
Fixed a merge issue from my pull just now. Removed My println for verifying inFileClient
Merge branch 'master' of https://github.com/accidentalManual/1653