Test
Merge branch 'master' of https://github.com/brianboru/erlang
Merge branch 'master' of https://github.com/brianboru/erlang
update from emacs