Merge pull request #3 from Sample-Organization/master

Feature 3 Completed
Feature 4