Add PR fixes from eth-mds
#58
+22,222
−21,791
Closed
eth-mds
#58