Fixed bug in list
Merge branch 'parallel' into proxy
Fixed problem with serialization