Fixes #61
Updates https://github.com/spf13/hugo/issues/3200
Updates https://github.com/spf13/hugo/issues/2577