Added RWI, resolves #163