WIP Elixir 0.13 compatability

Compatability with Elixir 0.13