Fully merged master with all code integrated