Fixes for Elixir 0.13
Merge pull request #1 from pma/master

Fixes for Elixir 0.13