diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..30c3973aa37
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,11 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+#
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+# The @googleapis/yoshi-python is the default owner for changes in this repo
+*               @googleapis/yoshi-python
+
+# The python-samples-reviewers team is the default owner for samples changes
+/samples/  @googleapis/python-samples-owners
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index 81a37f37f79..eafad65f5a2 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -35,4 +35,4 @@ Learn how to use the Google API Python Client with these guides:
 ### Reference Documentation
 
 - Reference documentation for the the core library [googleapiclient](http://googleapis.github.io/google-api-python-client/docs/epy/index.html).
-- [Library reference documentation by API](dyn/index.md).
+- [Library reference documentation by API](dyn/index.md). 
diff --git a/tools/gae-zip-creator.sh b/tools/gae-zip-creator.sh
index 152d5f96eea..71d41c1211a 100755
--- a/tools/gae-zip-creator.sh
+++ b/tools/gae-zip-creator.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+ #!/bin/bash
 #
 # Copyright 2014 Google Inc. All Rights Reserved.
 #