Removed stuff

Removed
merged master into dibaggioj

merged master into dibaggioj