update Elixir 1.0
add stop methods
Merge branch 'dev'