concurrent modification exception in reseravtion
Merge remote-tracking branch 'tomp2p/master'