#27 added expand parameter support