Refactoring
IDisposable has been implemented
Work on the documentation