Big changes to the whole state data stream
Merge branch 'master' of https://github.com/petercrona/StateDataStream