Updated to the current master branch

updated