Updated for Elixir 0.13.3 - WIP