Master branch changes
Commiting to master from Tortoise GIT