Some other functionalities
Merge pull request #6 from Edeph/oana

Some other functionalities