Patch 1

Combining the changes into master