Merge modification, corrections on DESCRIPTION AND NAMESPACE