added epmd back in
Merge branch 'test' into dev