Merged Master branch to include recent changes