Merge the latest master with my fork

Just updating my fork to be able to add my Code Snippet challenge later on.