Merged into my project

Merged my updates