Added code block for better readability and some more information
Merge branch 'master' into develop