Fix #20 - Release v2.2