This is related to #6
This is related to #6