Hugo

This issue and #259 are old, did the PR had any problems or why it wasn't merged ? And it looks backwards compatible