Close #29 and #32

Anything else you would like me to add @brookr?