RIO and AIO changes
Merge pull request #69 from ambiata/topic/rio

RIO and AIO changes