Add a feature request by @bamorim, closes #90