Added a new feature
Merge branch 'Master' into new-feature