apply cross-domain changes proposed in #23

closes #23