closes Webtales/rubedo#177 and WebTales/rubedo#178