Fixed Issue #31
Updated cwrc-api
Updated entities.rng