Optimization included
Documentation updated
Minor changes