Merge pull request #118 from oxylusengine/zpp_bits_rcp