Adding new feature here
Added some fixes and new code
Merge branch 'master' into NewFeature
Merge branch 'NewFeature'