Updated to latest rupa-z (submodule)