Fixed #21 and bumped version