Some improves and adding docstrings
Merge pull request #1329 from diegosarmentero/master

Some improves and adding docstrings