Version 0.2.4b:
- Code refactoring