- Bug corrected
- Add comments