When last DATA ACK received, would still timeout on EOT. Fixed it.
Created Boolean, if EOT not sent then don't timeout waiting for one.
Merge origin/master