added feature switches
v0.1.1