Getting Ready to merge into master branch