Implentation of new methods and code refactoring for release 0.0.2