Edited stuff
Merge commit 'a7ef0b7edca42e42d967b3bc4ef20c5c359f291a'