Merge branch 'feature/#142-content-replacer' into develop closes #142