closes #29; closes #30
v0.16