Fixing #21 and #22