Just noticed this PR, this has been done as part of #28