closes #29