Updating repo

Now that the Master branch is (finally!) fixed I can merge the repos.