Resolve issues #32 & #33