Support nodes in spot
#26
+33
−2
Merged
spot
#26