Feature 10 compelete
Merge pull request #4 from Chiene/Feature6

Feature 10 compelete