Now based on erlang-runtime Port
Merge branch 'master' into dev