Stabilized API a bit more and updated version to 2.2