Fixes #1 by adding the changes made at dgryski/7febfc3857f5824cb62d4caaeeac89c714f7ef37