Updated documentation
Bug fixing