Add support for expand
#17
+4
−4
Merged
expand
#17