Feature3 complete
Merge pull request #1 from Chiene/feature3

Feature3 complete