Bug fixes, update to 1.2.2