merged with current master branch while keeping the added changes