<Upd> Applying modif' from aldream.net/demo

Final Version
- Improvements
- Comments