diff --git a/ChangeLog.md b/ChangeLog.md
index 9ac346ae9..e83008fbb 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,14 +2,15 @@
 
 AdWords:
   - Fixed [issue #21](https://github.com/googleads/googleads-php-lib/issues/21).
+  - Fixed [issue #19](https://github.com/googleads/googleads-php-lib/issues/19).
 
 DFP:
-  - Fixed [pull request #18](https://github.com/googleads/googleads-php-lib/pull/18 "googleads-php-lib pull request #18").
+  - Fixed [pull request #18](https://github.com/googleads/googleads-php-lib/pull/18).
 
 Common:
-  - Fixed [issue #24](https://github.com/googleads/googleads-php-lib/issues/24 "googleads-php-lib issue #24").
+  - Fixed [issue #24](https://github.com/googleads/googleads-php-lib/issues/24).
   - Fixed [issue #10](https://github.com/googleads/googleads-php-lib/issues/10).
-  - Fixed [pull request #11](https://github.com/googleads/googleads-php-lib/pull/11 "googleads-php-lib pull request #11").
+  - Fixed [pull request #11](https://github.com/googleads/googleads-php-lib/pull/11).
 
 ### 5.2.1
 
@@ -46,7 +47,7 @@ Common:
 ### 5.1.0
 
 AdWords:
-  - Fixed [issue #9](https://github.com/googleads/googleads-php-lib/issues/9 "googleads-php-lib issue #9") - removing unused criteria object in example.
+  - Fixed [issue #9](https://github.com/googleads/googleads-php-lib/issues/9).
   - Added support for AdWords Express for v201309 (invite-only feature).
 
 DFP:
diff --git a/composer.json b/composer.json
new file mode 100755
index 000000000..92abb6ae8
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "googleads/googleads-php-lib",
+    "description": "Google Ads APIs Client Library for PHP (AdWords, Adx, and DFP)",
+    "require": {
+        "php": ">=5.2.0"
+    },
+    "type": "library",
+    "homepage": "https://github.com/googleads/googleads-php-lib",
+    "license": "Apache-2.0",
+    "include-path": ["src/"],
+    "authors": [
+      {
+        "name": "Paul Matthews",
+        "role": "Developer"
+      },
+      {
+        "name": "Adam Rogal",
+        "role": "Developer"
+      },
+      {
+        "name": "Mat Scales",
+        "role": "Developer"
+      },
+      {
+        "name": "Vincent Tsao",
+        "role": "Developer"
+      },
+      {
+        "name": "Ray Tsang",
+        "role": "Developer"
+      }
+    ]
+}
diff --git a/examples/AdWords/Auth/init.php b/examples/AdWords/Auth/init.php
index 03f593615..a2802756f 100755
--- a/examples/AdWords/Auth/init.php
+++ b/examples/AdWords/Auth/init.php
@@ -29,7 +29,7 @@
 error_reporting(E_STRICT | E_ALL);
 
 $depth = '/../../../';
-define('SRC_PATH', dirname(__FILE__) . $depth . 'src/');
+define('SRC_PATH', dirname(__FILE__) . $depth . 'lib/');
 define('LIB_PATH', 'Google/Api/Ads/AdWords/Lib');
 
 // Configure include path.
diff --git a/examples/AdWords/v201309/init.php b/examples/AdWords/v201309/init.php
index e0f66811b..44fa45a0d 100755
--- a/examples/AdWords/v201309/init.php
+++ b/examples/AdWords/v201309/init.php
@@ -30,7 +30,7 @@
 error_reporting(E_STRICT | E_ALL);
 
 $depth = '/../../../';
-define('SRC_PATH', dirname(__FILE__) . $depth . 'src/');
+define('SRC_PATH', dirname(__FILE__) . $depth . 'lib/');
 define('LIB_PATH', 'Google/Api/Ads/AdWords/Lib');
 define('UTIL_PATH', 'Google/Api/Ads/Common/Util');
 define('ADWORDS_UTIL_PATH', 'Google/Api/Ads/AdWords/Util');
diff --git a/examples/AdWords/v201402/init.php b/examples/AdWords/v201402/init.php
index 69c218454..08b71f13b 100755
--- a/examples/AdWords/v201402/init.php
+++ b/examples/AdWords/v201402/init.php
@@ -30,7 +30,7 @@
 error_reporting(E_STRICT | E_ALL);
 
 $depth = '/../../../';
-define('SRC_PATH', dirname(__FILE__) . $depth . 'src/');
+define('SRC_PATH', dirname(__FILE__) . $depth . 'lib/');
 define('LIB_PATH', 'Google/Api/Ads/AdWords/Lib');
 define('UTIL_PATH', 'Google/Api/Ads/Common/Util');
 define('ADWORDS_UTIL_PATH', 'Google/Api/Ads/AdWords/Util');
diff --git a/examples/Adx/v201306/init.php b/examples/Adx/v201306/init.php
index 53dfea7c5..6cfec2647 100755
--- a/examples/Adx/v201306/init.php
+++ b/examples/Adx/v201306/init.php
@@ -30,7 +30,7 @@
 error_reporting(E_STRICT | E_ALL);
 
 $depth = '/../../../';
-define('SRC_PATH', dirname(__FILE__) . $depth . 'src/');
+define('SRC_PATH', dirname(__FILE__) . $depth . 'lib/');
 define('LIB_PATH', 'Google/Api/Ads/AdWords/Lib');
 define('UTIL_PATH', 'Google/Api/Ads/Common/Util');
 define('ADWORDS_UTIL_PATH', 'Google/Api/Ads/AdWords/Util');