Pulled Master's changes

Pulled changes on the master branch to the Eric branch