Merging into master

Merging into master for enhancements