Closes #29, second part.