Edited some stuff
Merge commit 'edcac13b309b58e047cf5cad8719c963c45131eb'