Merge fixes from number #32 & #33