successfully merged with dev-lou
update to remove lou from bullshit-code
merged all branches and fixeded a typo