Implement #224 

:)