Updated to newest master branch