Latest commit 4864cd7 Jun 28, 2016 chatgris Merge branch 'elixir_13'