Updated for Elixir v0.13.3