Issues #33, #32 closed