Fixing #23, #22, #21
Version bump