Fix conflict when modifying object after adding datastream
Fixed conflict errors.
Merge pull request #70 from jonathangreen/1.x

 	Fix conflict when modifying object after adding datastream