Feature request, following from #36
Feature request, following from #36