Issue #78 solution