Last PR

- Correcting some bugs.
- Shaping files.
- Adding few functions.