Dev

Merge new and refactored functionalities with master branch