first revision
Merge branch 'master' of github.com:lrascao/erlang-srv-stub

upstream merge