latest version: 2.z

Code refactored.