Patch to upgrade to Elixir-0.13.3

Hi, I have tried my best to clean up the code to make it 0.13.3 compatible, but the test seems to be hanging up on some logic, can you help me have a look at it ?