Starting json updates
Merge branch '1.0.6' into json
Finished most of code to load multiple OIs from json stream