Development

@petrus-jvrensburg  Cross-domain support and fix a little bug in base.txt