implementing #73
closes #73