Merge pull request #2 from David29595/master

Merge pull request #1 from David29595/feature1
Merge pull request #3 from David29595/feature1

Merge pull request #2 from David29595/master