Bug fixes, refactored and more features: 2.3.2