Fixing #32 and #33