This Issue extends #16
This Issue extends #16