add elixir
merging upstream.  Add elixir.