Updating xstream due security issues
Merge pull request #376 from garcia-jj/ot-updating-xstream

Updating xstream due security issues and other improvements