Merged Pull from https://github.com/chorny