RIO and AIO changes

ambiata/mundane#72
0.13.6