Bring the code up-to-date with Elixir 0.10.2