Bug fixes

Solved timeout-problem;
Solved double delivery of free items

Signed-off-by: Lukas Eberhard <lukas@vpn1-32.tu-graz.ac.at>