This issue is to follow up on PR #17
This issue is to follow up on PR #17