Closes #29