WIP
Merge remote-tracking branch 'origin/master'
DAMN IT, FINALLY
merge reverted version