Updating master branch

Pulling recent changes into master branch