fixes options are not expanded problem
fixes missing end
v0.1.1