Merge pull request #1 from salimusta2/feature1

Feature1 Draft :smile:
Feature1 BugFix by master :oops:
Feature1 BugFix1 modified :+1: