Corrected logs, timeout duration
Corrected logs, timeout duration
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Corrected the uploading, now ads the time it uploads data.
Added exception for incorrect data received.