Bugfix 3.2.1. Changes in gem structure and batch of bug fixes.