Added a lot of docstrings
fixed merge conflicts. Develop and Master are synced