Merged fromm Master Branch

to stay up to date