- Some code improvements
- Fix for version upgrade