First commit on Feature 1

First commit on Feature 1
Merge pull request #1 from mustafa82/master

Feature 1 is implemented