pushing changes
wip
fixed old merge conflicts
Merge branch 'master' into compare