v1.0.9_6

- Bug fixes
- Improvements