Feature 6 compelete
Merge pull request #3 from Chiene/Feature6

Feature 6 compelete